From 0f8c2874bcef35ba9547b7daa4fcdf3b7f57f6c7 Mon Sep 17 00:00:00 2001 From: robertl Date: Sat, 18 Jul 2009 20:25:24 +0000 Subject: [PATCH] Fix warnings about non-const sprintf formatters. --- csv_util.c | 4 ++-- gopal.c | 2 +- pathaway.c | 2 +- shape.c | 2 +- xmldoc/formats/delbin.xml | 7 ++++++- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/csv_util.c b/csv_util.c index 66ed7ad6e..1eaea9548 100644 --- a/csv_util.c +++ b/csv_util.c @@ -654,7 +654,7 @@ dec_to_human( char *buff, const char *format, const char *dirs, double val ) index++; break; case '%': - sprintf( buff+strlen(buff), subformat ); + sprintf( buff+strlen(buff), "%s", subformat ); break; default: fatal(MYNAME ": invalid format specifier\n"); @@ -663,7 +663,7 @@ dec_to_human( char *buff, const char *format, const char *dirs, double val ) } } else { - sprintf( buff+strlen(buff), subformat ); + sprintf( buff+strlen(buff), "%s", subformat ); } formatptr += strlen(subformat); } diff --git a/gopal.c b/gopal.c index b4786c224..7e1eeded7 100644 --- a/gopal.c +++ b/gopal.c @@ -92,7 +92,7 @@ int gopal_check_line(char *line) if (i != 8) { snprintf(tmp,sizeof(tmp),"\"%s\"\n",line); - fprintf(stderr,tmp); + fprintf(stderr,"%s",tmp); } return i; } diff --git a/pathaway.c b/pathaway.c index d8327e209..2e7661817 100644 --- a/pathaway.c +++ b/pathaway.c @@ -638,7 +638,7 @@ static void ppdb_write_wpt(const waypoint *wpt) if (fabs(wpt->altitude) < 9999.0) { tmp = str_pool_get(32); - snprintf(tmp, 32, ppdb_fmt_float(METERS_TO_FEET(wpt->altitude))); + snprintf(tmp, 32, "%s", ppdb_fmt_float(METERS_TO_FEET(wpt->altitude))); buff = ppdb_strcat(buff, tmp, NULL, &len); } buff = ppdb_strcat(buff, ",", NULL, &len); diff --git a/shape.c b/shape.c index 109541238..9f36e0a97 100644 --- a/shape.c +++ b/shape.c @@ -75,7 +75,7 @@ my_rd_init(const char *fname) txt = xstrappend( txt, txtName ); } txt = xstrappend( txt, "\n" ); - fatal( txt ); + fatal("%s", txt); } if ( strchr(opt_name, '+')) { nameidx = -2; diff --git a/xmldoc/formats/delbin.xml b/xmldoc/formats/delbin.xml index 3b7280f1c..83909bcab 100644 --- a/xmldoc/formats/delbin.xml +++ b/xmldoc/formats/delbin.xml @@ -1,5 +1,5 @@ - The 'delbin' module supports DeLorme PN-20, PN-30, and PN-40 receivers. + The 'delbin' module supports DeLorme PN-20, PN-30, PN-40, and PN-40 SE receivers. Not all strains of Linux are supported. Fedora 7 is known not to work, for example. @@ -31,3 +31,8 @@ +<<<<<<< delbin.xml + + +======= +>>>>>>> 1.3 -- 2.30.2